From 3c82abc2945f178e00d8a588e8b043c5a9031813 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 6 May 2010 11:06:08 +0100
Subject: [PATCH] ocaml: remove hook to external repository.

Signed-off-by: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
---
 Config.mk               |  6 ------
 tools/Makefile          | 21 ---------------------
 tools/xenstore/Makefile |  5 -----
 3 files changed, 32 deletions(-)

diff --git a/Config.mk b/Config.mk
index 7fe691fed4..0552505757 100644
--- a/Config.mk
+++ b/Config.mk
@@ -158,12 +158,6 @@ QEMU_TAG ?= 01626771cf2e9285fbfddcbded2820fc77745e4b
 # Fri Apr 30 17:41:45 2010 +0100
 # Implement 'xm vcpu-set' command for HVM guest
 
-OCAML_XENSTORED_REPO=http://xenbits.xensource.com/ext/xen-ocaml-tools.hg
-
-# Build OCAML version of xenstored instead of the in-tree C version?
-# This will cause $(OCAML_XENSTORED_REPO) to be cloned.
-CONFIG_OCAML_XENSTORED ?= n
-
 # Optional components
 XENSTAT_XENTOP     ?= y
 VTPM_TOOLS         ?= n
diff --git a/tools/Makefile b/tools/Makefile
index 48c98026b8..c34dc864b0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,7 +6,6 @@ SUBDIRS-y += check
 SUBDIRS-y += include
 SUBDIRS-y += libxc
 SUBDIRS-y += flask
-SUBDIRS-$(CONFIG_OCAML_XENSTORED) += ocaml-xenstored
 SUBDIRS-y += xenstore
 SUBDIRS-y += misc
 SUBDIRS-y += examples
@@ -114,23 +113,3 @@ subdir-clean-ioemu-dir:
 		$(buildmakevars2shellvars); \
 		$(MAKE) -C ioemu-dir clean; \
 	fi
-
-ocaml-xenstored:
-	set -ex; \
-	rm -rf ocaml-xenstored.tmp; \
-	hg clone $(OCAML_XENSTORED_REPO) ocaml-xenstored.tmp; \
-	if [ "$(OCAML_XENSTORED_TAG)" ]; then \
-		hg -R ocaml-xenstored.tmp update -r $(OCAML_XENSTORED_TAG) ;\
-		hg -R ocaml-xenstored.tmp branch mybranch ;\
-	fi;						\
-	mv ocaml-xenstored.tmp ocaml-xenstored; \
-
-subdir-all-ocaml-xenstored subdir-install-ocaml-xenstored: ocaml-xenstored
-	$(absolutify_xen_root); \
-	$(MAKE) -C ocaml-xenstored $(patsubst subdir-%-ocaml-xenstored,%,$@);
-
-subdir-clean-ocaml-xenstored:
-	set -e; if test -d ocaml-xenstored; then \
-		$(MAKE) -C ocaml-xenstored clean; \
-	fi
-
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index f64ba9face..6ef6ff0075 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -95,11 +95,6 @@ tarball: clean
 
 .PHONY: install
 install: all
-ifneq ($(CONFIG_OCAML_XENSTORED),y)
-	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
-	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
-	$(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
-endif
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-- 
2.30.2